From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 5 Sep 2025 14:07:05 +0000 (+0200)
Subject: batman-adv: update to version 2025.3
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=abc6f5a32ad22e923a8900fcd8c855c15a9ecd2e;p=feed%2Frouting.git

batman-adv: update to version 2025.3

* support latest kernels (5.4 - 6.17)
* coding style cleanups and refactoring
* bugs squashed:
  - fix OOB read/write in network-coding decode

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index ab54f43..99900a0 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2025.2
+PKG_VERSION:=2025.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=16c45f8bb8f305371cd90e888630cfb251c2b189e5532a527a936fa35ba497f7
+PKG_HASH:=be0823a0936bf59e2af2d115a7e26317f8220b998f4833257465af2b6ffe1ce8
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
diff --git a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
index f5e9d42..bf3605c 100644
--- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
+++ b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
@@ -65,5 +65,5 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/init.h>
 +#include <linux/kernel.h>
  #include <linux/limits.h>
- #include <linux/list.h>
  #include <linux/minmax.h>
+ #include <linux/netdevice.h>